Decode replies using actual received length#54
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When decoding replies, the code previously passed the whole 2048-byte zero-filled buffer instead of slicing it to
n, the number of bytes actually returned byrecv_from. This changes all three decode paths to use&buffer[..n]: bare IPv4 ICMP, IPv4 with IP-header stripping, and IPv6.As a result, the inner ICMP length extracted by
IpV4Packet::decodereflects the real packet length rather than including trailing zero padding. Combined with the previously tightened length check inEchoReply::decode, short or malformed replies now returnInvalidSizeand get skipped by the loop, instead of having a bogus payload read out of the zero padding. Then == 32branch still holds, since a RAW reply always carries an IP header and is therefore at least 52 bytes, so it can never be mistaken for the bare-ICMP branch.